From: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Date: Wed, 13 Feb 2013 17:04:33 +0000 (+0000)
Subject: xen/flask: fix crash on debugkey "i"
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7297
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=505023822fe48af3636fd6cdb1e689760831efac;p=xen.git

xen/flask: fix crash on debugkey "i"

The IRQs beyond nr_static_irqs do not all have an associated PCI
device, so only query the device SID if pci is not NULL.

Signed-off-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Acked-by: Jan Beulich <jbeulich@suse.com>
Committed-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c
index 85d009c42b..29a78dd06e 100644
--- a/xen/xsm/flask/hooks.c
+++ b/xen/xsm/flask/hooks.c
@@ -110,7 +110,7 @@ static int get_irq_sid(int irq, u32 *sid, struct avc_audit_data *ad)
         }
         return security_irq_sid(irq, sid);
     }
-    if ( desc->msi_desc ) {
+    if ( desc->msi_desc && desc->msi_desc->dev ) {
         struct pci_dev *dev = desc->msi_desc->dev;
         u32 sbdf = (dev->seg << 16) | (dev->bus << 8) | dev->devfn;
         if (ad) {